From b2e7eb9bf48e3e224574129e54399551e63c6f9e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 3 Nov 2003 19:20:23 +0000 Subject: [PATCH] (rmail-convert-to-babyl-format): If base64-decode-region signals an error, catch it and silently ignore it. --- lisp/mail/rmail.el | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 009050b1fbd..acc7e4839dd 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1687,17 +1687,19 @@ It returns t if it got any new messages." (delete-region (point) (search-backward ":")) (insert ": 8bit"))) (if base64-header-field-end - (save-excursion - (base64-decode-region (1+ header-end) - (- (point) 2)) - ;; Change "base64" to "8bit", to reflect the - ;; decoding we just did. - (goto-char (1+ header-end)) - (while (search-forward "\r\n" (point-max) t) - (replace-match "\n")) - (goto-char base64-header-field-end) - (delete-region (point) (search-backward ":")) - (insert ": 8bit"))) + (condition-case nil + (save-excursion + (base64-decode-region (1+ header-end) + (- (point) 2)) + ;; Change "base64" to "8bit", to reflect the + ;; decoding we just did. + (goto-char (1+ header-end)) + (while (search-forward "\r\n" (point-max) t) + (replace-match "\n")) + (goto-char base64-header-field-end) + (delete-region (point) (search-backward ":")) + (insert ": 8bit")) + (error nil))) (setq last-coding-system-used nil) (or rmail-enable-mime (not rmail-enable-multibyte) @@ -1827,13 +1829,15 @@ It returns t if it got any new messages." (delete-region (point) (search-backward ":")) (insert ": 8bit"))) (if base64-header-field-end - (save-excursion - (base64-decode-region header-end (point)) - ;; Change "base64" to "8bit", to reflect the - ;; decoding we just did. - (goto-char base64-header-field-end) - (delete-region (point) (search-backward ":")) - (insert ": 8bit")))) + (condition-case nil + (save-excursion + (base64-decode-region header-end (point)) + ;; Change "base64" to "8bit", to reflect the + ;; decoding we just did. + (goto-char base64-header-field-end) + (delete-region (point) (search-backward ":")) + (insert ": 8bit")) + (error nil)))) (save-excursion (save-restriction -- 2.30.2